From 171ff43340a9a0a8a896d067fe83b72bc82b887e Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 21 Jul 2017 16:00:44 +0800 Subject: [PATCH] tests: Include system headers appropriately Don't include unistd.h on Windows, and include the appropriate headers on Windows as necessary. https://bugzilla.gnome.org/show_bug.cgi?id=773299 --- tests/testanimation.c | 5 ++++- testsuite/a11y/accessibility-dump.c | 4 ++++ testsuite/css/nodes/test-css-nodes.c | 4 ++++ testsuite/css/parser/test-css-parser.c | 4 ++++ testsuite/css/style/test-css-style.c | 4 ++++ testsuite/reftests/gtk-reftest.c | 4 ++++ 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/tests/testanimation.c b/tests/testanimation.c index 45f4602f3d..8190be9e86 100644 --- a/tests/testanimation.c +++ b/tests/testanimation.c @@ -19,11 +19,14 @@ #include "config.h" #include #include -#include #include #include #include +#ifndef G_OS_WIN32 +# include +#endif + typedef struct _LoadContext LoadContext; struct _LoadContext diff --git a/testsuite/a11y/accessibility-dump.c b/testsuite/a11y/accessibility-dump.c index eb90477ad0..5f848fb96a 100644 --- a/testsuite/a11y/accessibility-dump.c +++ b/testsuite/a11y/accessibility-dump.c @@ -25,6 +25,10 @@ #include #include +#ifdef G_OS_WIN32 +# include +#endif + #define DEPTH_INCREMENT 2 static char * diff --git a/testsuite/css/nodes/test-css-nodes.c b/testsuite/css/nodes/test-css-nodes.c index bb0b02cc48..334b60a11c 100644 --- a/testsuite/css/nodes/test-css-nodes.c +++ b/testsuite/css/nodes/test-css-nodes.c @@ -22,6 +22,10 @@ #include #include +#ifdef G_OS_WIN32 +# include +#endif + static char * test_get_reference_file (const char *ui_file) diff --git a/testsuite/css/parser/test-css-parser.c b/testsuite/css/parser/test-css-parser.c index ff6340986c..f79c580421 100644 --- a/testsuite/css/parser/test-css-parser.c +++ b/testsuite/css/parser/test-css-parser.c @@ -26,6 +26,10 @@ #include #include +#ifdef G_OS_WIN32 +# include +#endif + static char * test_get_reference_file (const char *css_file) { diff --git a/testsuite/css/style/test-css-style.c b/testsuite/css/style/test-css-style.c index 130132af26..4555db1926 100644 --- a/testsuite/css/style/test-css-style.c +++ b/testsuite/css/style/test-css-style.c @@ -22,6 +22,10 @@ #include #include +#ifdef G_OS_WIN32 +# include +#endif + /* There shall be no other styles */ #define GTK_STYLE_PROVIDER_PRIORITY_FORCE G_MAXUINT diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c index d8d82d695d..758007a12a 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c @@ -28,6 +28,10 @@ #include #include +#ifdef G_OS_WIN32 +# include +#endif + typedef enum { SNAPSHOT_WINDOW, SNAPSHOT_DRAW -- 2.30.2